diff --git a/db845c/device.mk b/db845c/device.mk
index 04967ed..6f08e0a 100644
--- a/db845c/device.mk
+++ b/db845c/device.mk
@@ -58,6 +58,10 @@
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Qualcomm
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=SDM845
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION) \
+    vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)
+
 # Copy firmware files
 $(call inherit-product-if-exists, vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk)
 $(call inherit-product-if-exists, vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk)
diff --git a/device-common.mk b/device-common.mk
index 886f9e5..a197f86 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -53,9 +53,7 @@
 
 PRODUCT_SOONG_NAMESPACES += \
     device/linaro/dragonboard \
-    vendor/linaro/linux-firmware/$(EXPECTED_LINARO_VENDOR_VERSION) \
-    vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION) \
-    vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)
+    vendor/linaro/shared/$(EXPECTED_LINARO_VENDOR_VERSION)/linux-firmware
 
 # Dynamic partitions
 PRODUCT_BUILD_SUPER_PARTITION := true
diff --git a/linaro_swr/device.mk b/linaro_swr/device.mk
index 4386aa3..5716fa0 100644
--- a/linaro_swr/device.mk
+++ b/linaro_swr/device.mk
@@ -58,6 +58,10 @@
 PRODUCT_VENDOR_PROPERTIES += \
     vendor.minigbm.debug=nocompression
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION) \
+    vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)
+
 # Copy firmware files
 $(call inherit-product-if-exists, vendor/linaro/db845c/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk)
 $(call inherit-product-if-exists, vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk)
diff --git a/rb5/device.mk b/rb5/device.mk
index 1f6cc4b..287ec9b 100644
--- a/rb5/device.mk
+++ b/rb5/device.mk
@@ -56,6 +56,9 @@
 PRODUCT_VENDOR_PROPERTIES += ro.soc.manufacturer=Qualcomm
 PRODUCT_VENDOR_PROPERTIES += ro.soc.model=QRB5165
 
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)
+
 # Copy firmware files
 $(call inherit-product-if-exists, vendor/linaro/rb5/$(EXPECTED_LINARO_VENDOR_VERSION)/device.mk)
 
diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh
index 2fedb52..695d643 100755
--- a/vendor-package-ver.sh
+++ b/vendor-package-ver.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
-export EXPECTED_LINARO_VENDOR_VERSION=20240116
+export EXPECTED_LINARO_VENDOR_VERSION=20240318
 #make sure to use sha512sum here
-export EXPECTED_LINARO_VENDOR_SHA=296bd7b7caef406419e6f2543a5ab6b75faada6c35486be5030b0c760b40b81f90ace79b40e9b5326ca2a36975b75438cb0a211037ae18db84115a8a22871c39
-export VND_PKG_URL=https://releases.devboardsforandroid.linaro.org/vendor-packages/20240116/extract-linaro_devices-20240116.tgz
+export EXPECTED_LINARO_VENDOR_SHA=5adf8f15aaed3d36c4fc7531a77e3bc0daf88fbf1532482804b157c0d4a18ed1f43c273bfd4f05e531adb5815913d71c1172d42bd41034a3dbd1a3d51ac7e4f4
+export VND_PKG_URL=https://releases.devboardsforandroid.linaro.org/vendor-packages/20240318/extract-linaro_devices-20240318.tgz
 
 if [ "$1" = "url" ]; then
  echo $VND_PKG_URL